gnomeos: Ensure we have a symlink to an empty /var/shadow

diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
index 469463d6a75a640eef52d1f740aaf3ef2a8afab4..7d1267dbd8c0e9aba43488d20fb14df954e43891 100644 (file)
--- a/gnomeos/yocto/classes/gnomeos-contents.bbclass
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -116,8 +116,10 @@ EOF
        ln -sf /var/run/resolv.conf ${IMAGE_ROOTFS}/etc/resolv.conf
 
        # The passwd database is stored in /var.
-       rm -f ${IMAGE_ROOTFS}/etc/passwd ${IMAGE_ROOTFS}/etc/shadow ${IMAGE_ROOTFS}/etc/shadow-
+       rm -f ${IMAGE_ROOTFS}/etc/passwd
        ln -s /var/passwd ${IMAGE_ROOTFS}/etc/passwd
+       rm -f ${IMAGE_ROOTFS}/etc/shadow ${IMAGE_ROOTFS}/etc/shadow-
+       ln -s /var/shadow ${IMAGE_ROOTFS}/etc/shadow
        rm -f ${IMAGE_ROOTFS}/etc/group
        ln -s /var/group ${IMAGE_ROOTFS}/etc/group
 

diff --git a/gnomeos/yocto/gnomeos-run.sh b/gnomeos/yocto/gnomeos-run.sh
index c6f3d5724aa8bfc7cb6a6f29ba311b0d4c920807..15352aaf04ed39fd75a26bbc73ff53b37290e086 100755 (executable)
--- a/gnomeos/yocto/gnomeos-run.sh
+++ b/gnomeos/yocto/gnomeos-run.sh
@@ -77,6 +77,9 @@ if ! test -d ostree; then
     mkdir ./ostree/var/lib/gdm
     chown 2:2 ./ostree/var/lib/gdm
 
+    touch /var/shadow
+    chmod 0600 /var/shadow
+
     mkdir ostree/repo
     ostree --repo=ostree/repo init